Revert 079c4b2..b1e0cd8

This rolls back to commit 079c4b25f2fd1b9a65d2cfb4ba57e5cc0b7a150b.