Revert a126563..ab813a1

This rolls back to commit a12656349b6f22b2a768480eec135240db04e988.