Revert fbc8703..b1d185f

This rolls back to commit fbc8703c97d680f70ee51ea26e14a623df7637c4.