Revert 7fa3bed..652143b

This rolls back to commit 7fa3bed8fada512c753b3a4b664f1b0676795ff9.