Revert 070deb0..481432e

This rolls back to commit 070deb0a93292f133d92e07bf2c61a8d76844dbd.