Revert a124887..a6f7e59

This rolls back to commit a124887e0ba4626d17b6199086203bc01deab296.