Revert 5a9c5ed..1d81db8

This rolls back to commit 5a9c5edabae8312744478b8e48471c5d4f6e7c1c.