Revert 1ce706f..beef823

This rolls back to commit 1ce706ffca30042a414876d13c88231158b7f26c.
Revert eea6c85..c1a6d7f

This rolls back to commit eea6c85903c22c4985791e1fb4a978cd9e5f3c96.