Revert 61e0b9b..9fc3b9a

This rolls back to commit 61e0b9b8e3efd3080da90375bd6f66f1b8cafd39.
Fixes error in merge