Revert 0605458..7af4bb8

This rolls back to commit 06054584fcb46025ee4fa345eb41e9ac83021116.
Revert 7af4bb8..6e5bb51

This rolls back to commit 7af4bb801f76ece000765a76956d9b57510d9e7a.