Rolling back changes from 18ef8bfe0747a8ad80c76c0c01218635ebeef228 and f46e9233ae3a2623ca38120f50b15d8141b68b5c