Revert 7e471b5..6d9948b

This rolls back to commit 7e471b5e446b57b19fc9d8b8032dd51f900839be.