Revert 3353004..a0c11d4

This rolls back to commit 33530047e53ebf35a9ee967314d32a4afa533330.