Revert 0e92b3e..b26908b

This rolls back to commit 0e92b3ecf50fa778cb6acc902b663682fe8feda3.