Revert ba8a552..9799ce8

This rolls back to commit ba8a552dccc51becc93b9a74b91eb8a3a85557f0.