Revert 69b4c06..db943dc

This rolls back to commit 69b4c063586361e294a3388a91e7fc08d2211db4.