Revert 17edc73..98a87be

This rolls back to commit 17edc73db408783a7de8b33475e0faea4b3f26b2.