Revert 0a95e47..adc0fa5

This rolls back to commit 0a95e470ffe7316f903dd03d58975896f71ddf93.