Revert 51470ff..eb0146a

This rolls back to commit 51470ff144bc102fcf01c43b0cec5d9235342633.