Revert 9c123be..3293f05

This rolls back to commit 9c123befe20af1418f4f786bfae8b63daddbcdf4.