Revert 0900b11..8acef92

This rolls back to commit 0900b11b8ab4e3baf4e17280e5931fbd1178fcd8.