Revert f3950d5..4293d7c

This rolls back to commit f3950d50f763779f247180b4a546fda55b99b7c7.