Revert 633801e..c7c6efa

This rolls back to commit 633801ed1fa4041a3eb64c3c6c041c73d061a42c.