Revert 572965d..76567e6

This rolls back to commit 572965d48801bf14aa057daaadcec54cbb50e367.