Revert 7e90d7b..f99d9e5

This rolls back to commit 7e90d7bd7293267001323a20d59c2703d7117f29.