Revert 4f5686d..e2a61b6

This rolls back to commit 4f5686d21926be3710c8cb610f52ed710a124bd6.