Revert 473d987..44cc84a

This rolls back to commit 473d9879c0e5608537ea5c0555e15845eaf6c7a2.
Revert 44cc84a..b5bb48a

This rolls back to commit 44cc84a791f5a85045e08dc63f828d0462846f81.
Revert "bug fix"

This reverts commit 44cc84a791f5a85045e08dc63f828d0462846f81.