Bug fix
Revert "Bug fix"

This reverts commit a1de18c27da35e914947abc9f8162a0a2292d0b4.