Revert f940b96..abb9bf8

This rolls back to commit f940b96de6bd8964e165e2b83de291d1d395db19.