Revert 5a5f2df..84e5fc2

This rolls back to commit 5a5f2df1f608daed21244c1c9287766d43f14124.