Revert 839ec4a..bf9d49c

This rolls back to commit 839ec4a39a191a3bd3506d7a1c829b578528d307.