Revert "fixed bad merge"

This reverts commit 001cc62dd2a19e3e85586f1ddaa734056f1b0ec3.