Revert 04a286a..3b4d012

This rolls back to commit 04a286aeabf25d5de4227252c28caddf7581908d.