Revert 01c07f7..53f17a0

This rolls back to commit 01c07f7fa5a8b1cabf9a478fc489493e108e0d22.