Revert 763c659..5d6fd1f

This rolls back to commit 763c659b4f71c0790b1556b5de0527b14a5f1c82.