Revert 47bf438..7e7731e

This rolls back to commit 47bf43867b17a3959fc986dde2719c8e4d4cc7c1.