Revert 24fdcfc..ef73876

This rolls back to commit 24fdcfcedd93d29531a8536703a1731fc740af7e.