Revert 5aba0f5..2d2d9de

This rolls back to commit 5aba0f57a5c8206a56a1c51474938a1c99720f12.