Revert 56379b6..6ccbeda

This rolls back to commit 56379b66b1d13bb35e26a22dc0f76c7eff664eea.