Revert 45907e4..e89ff2d

This rolls back to commit 45907e4b6ff33fe2249529912423f816c0ed97b3.