Revert 284d6c0..9ae415a

This rolls back to commit 284d6c0f1510a00e7e66e5a0b5f2e78c15dd8fa5.