Revert 8ec75b3..8074352

This rolls back to commit 8ec75b32f54e9f44f42428fc65d66a093c55bba1.