Revert 03cb28d..fccc09c

This rolls back to commit 03cb28daad88642a97626708b15fad49b896e076.