Revert f8a54fb..3c3ecfe

This rolls back to commit f8a54fbf5873e577a3cc212092455757c79108cb.