Revert 245cefd..f493418

This rolls back to commit 245cefde93f6ab4afb46a3056e1a50cf9a932205.