Removed part of previous commit due to bug.