Revert "Fixed incorrect merge"

This reverts commit 7531cffb104459bf09402c747196d6a79ced7fb3.