Revert 510c838..2dc7c4a

This rolls back to commit 510c83828be06a85f9338edc729e54309cd8ced4.