Revert 28c6c2d..69f655a

This rolls back to commit 28c6c2d80a7446d1b564792096a689aa236184d0.