Revert bf14ea8..4d96e0d

This rolls back to commit bf14ea8e0f77148f912fac962688b69134642a96.