Revert f6c0032..c6fafb0

This rolls back to commit f6c00322a4c15d30148a33d58553eff16506bbd7.
Revert b25f72b..1d5e7b7

This rolls back to commit b25f72bc98378113ec915d8dca80437ea4aae0f8.