Revert 94b803f..8eacf29

This rolls back to commit 94b803f657f36166902606a5c74bb883c45d3d1a.