Revert 7d30abf..333ebb5

This rolls back to commit 7d30abf6404f6274459d377773bbc641925bad8a.