Revert 473e303..8f0c658

This rolls back to commit 473e3033c366daa0cd2d421afc8c75fbbc7d50e3.