Revert 3a8fbd5..22ba4fe

This rolls back to commit 3a8fbd5f435d93a2262cf7539a878dad0b13dd55.