Revert fc73281..bcc094b

This rolls back to commit fc7328191c0496140a91b44205defbf37f941805.