Revert 14b15c2..b6c938b

This rolls back to commit 14b15c2f4f185fe2747ed55febca5134393a002a.