Revert 14e5b2b..1a279b0

This rolls back to commit 14e5b2b0066ceb02fca7ec3ee467deedbb9d6a6b.