Revert 89056cd..6384093

This rolls back to commit 89056cdc440594988505efe1a7edb8bef44f62ce.