Revert d28d7dc..6044965

This rolls back to commit d28d7dc5691cfadae73e561c1fc70209b90390a0.
Revert 6044965..e282ecb

This rolls back to commit 604496575a11728fc6eaafcf75e11b2d83b6c706.