Revert bec43f1..1b4706e

This rolls back to commit bec43f1c98a90d6337cb481aed4a9b8c6b14c12e.