Partial rollback for backwards compatibility. See #48 #49