Revert 46e2cea..de27ca1

This rolls back to commit 46e2cea143cd4cd39e6592904f397364f80453e1.