Revert a437156..21b6d14

This rolls back to commit a437156b9f3ae7727ad4937051b040838161bab9.