Revert 4f3851d..9b940af

This rolls back to commit 4f3851dcfb682b83bc6a888e37b2ba8770c7a10a.