Revert f984735..062f1af

This rolls back to commit f9847351c3f515ad7379659e69b4b86ec314da96.