Revert 244953a..b2a6462

This rolls back to commit 244953a260c8df6f5734f756b0e07340c419a489.