Revert 7e2de1c..415bccc

This rolls back to commit 7e2de1c889666ad34e09ad313e2fc54613d42c47.