Revert 57b25b3..7893537

This rolls back to commit 57b25b333d584ea4a13a2d00a41066426686c273.