Reverted previous commits