Revert 64ad2e6..bb5c863

This rolls back to commit 64ad2e610e039d05e9f6836a3d6dc759150c2b18.