Revert 4ac1685..a115834

This rolls back to commit 4ac1685ea821e51b54ed35071571cf7e8e1a896f.