Revert bc9b136..7539bc6

This rolls back to commit bc9b136b6702a2ecb04fd999cd9914c8577cf3e9.