Revert 8624b0f..6dd471b

This rolls back to commit 8624b0f3684da9b989ecf6b3b052cddc84e28d54.