Revert 12ea980..ce108bf

This rolls back to commit 12ea9807a2f479510f8e94280b48db5cc6a0212d.