Revert 4818a03..b998ed8

This rolls back to commit 4818a03f3ec7743cc5a374ccd76fdfe4821b7cd5.