Revert 8f5bc67..b5d58e6

This rolls back to commit 8f5bc67ce5805be253e073033640824ff8592bcc.
UD