Revert 3e12943..dc399a8

This rolls back to commit 3e129435e192367a371362c6f226aa947deb3e04.