Revert 7054658..50f7765

This rolls back to commit 70546587c6fe01c312dc4a5be40bea3dc41388c8.