Revert 2d7d2f2..2900a26

This rolls back to commit 2d7d2f2b2bde82d62e33b0aab1901aed33349daf.
D