Revert all changes since 249cb6