Revert 71ec58e..a217341

This rolls back to commit 71ec58e99fbe9e7257fbb80ab2b5df7a109f2107.