Revert 3ece2b6..3c21393

This rolls back to commit 3ece2b6c9dd07a5acbd2eaa5bc602e5f3ae417ca.