Revert 62d8fcf..f9c47bf

This rolls back to commit 62d8fcfb9d2a20bc49db38a8e39f7ae718956ed2.