Revert c333240..49cbed7

This rolls back to commit c3332409a95bff998805f27249de88dd09988cf6.