Revert 127e9a3..7fd1942

This rolls back to commit 127e9a316e7f0b0c99ea837e80a563282a5d6d3c.