Revert 063ab2f..cd81c3c

This rolls back to commit 063ab2fb85a9c39ff885ecf0c3e6448e93d50150.