Revert 91db733..9593f9d

This rolls back to commit 91db7330ec2ab00fdd80fef06a316b0f68844244.