Revert c35069d..d108e0d

This rolls back to commit c35069d29569694d0dbbb7bc68c3d779c0d5828f.