Revert 8332e2f..a4eab8d

This rolls back to commit 8332e2fee8b987ea0da91b8e158cb3eebbd6e8d9.