Revert 961988a..be306b8

This rolls back to commit 961988abab98e0ce14a429ad0aa0fc142848a196.