Revert 049a857..cd6b93d

This rolls back to commit 049a85722141fdb45e01ca10db89b727bf5d5df0.