Revert ef32fb6..3da2a9a

This rolls back to commit ef32fb6581f37da68a8198bd4975b895724b8016.