Revert 04b3290..88bcb83

This rolls back to commit 04b3290b0a2c4f073432c443ea3c540186b61c3a.