Reverted all changes from 0.26.2