Revert "Bug fix"

This reverts commit e2b7f6fd21db9787ba76bc5905ce3262195ef761.