Revert 7488de4..f9ed1be

This rolls back to commit 7488de43db8e0d75650e5e4b65bf8ddee7d49a57.