Revert a3dce34..950ff21

This rolls back to commit a3dce349726539de668ee9b858f829ac5e5a72b6.