Revert 05e2e9b..151399d

This rolls back to commit 05e2e9b97abc8e00a2a52bc25d5f1accb8b2cca5.
Updaet