This reverts commit aa75e51f99. See #390 This is being reverted instead of modified due to #388
aa75e51f99