Revert 4376e30..04e249a

This rolls back to commit 4376e300055b86da0cb92e85776007f5cc6bc598.