Revert 8b1ccaa..ba151b3

This rolls back to commit 8b1ccaa5dc38bbe185475a5b251322785f02f2db.