Revert f4077cf..977bb31

This rolls back to commit f4077cfc8752b6f4b353370b90ab7cdd034affe5.
Revert 977bb31..2c9918c

This rolls back to commit 977bb31540920e7bed0c585af3fb3156936a813c.