Revert 57dd29e..234cd88

This rolls back to commit 57dd29e4e347541a42255b159868f177056bff64.