Undo changes introduced in e0bf21f155b202e05c1bec816149d75d507bc0ff