Revert 3e966bb..42f3c05

This rolls back to commit 3e966bb9972561a4bb83ed79c11bd9f085ae2696.