Revert 4cd4c81..ab7396f

This rolls back to commit 4cd4c8129dc83eddc4494892b6c8735eae31421d.