Reverting to previous version. Those changes were meant for a different branch.