Revert 03d9787..1e82bee

This rolls back to commit 03d9787bf8401c6b163d945ff1ee22812e50dd82.