Revert 5263619..5fa6434

This rolls back to commit 526361977bbff3a4d89b36dcc6be744050f29202.