Revert bfcab08..48af6ef

This rolls back to commit bfcab08dd4dd629ab609dc66bc08253a2d2ceb92.