Revert 05e6692..63e4898

This rolls back to commit 05e669200e83cede9508b0d2547a17f0dded98b8.