Revert ff40b66..76d195f

This rolls back to commit ff40b6695715e776cddd0627b4f3b73c98aaad46.